Reset the state on dispose.

2007-05-18  Emmanuele Bassi  <ebassi@gnome.org>

	* gtk/gtkrecentchooserdefault.c:
	(gtk_recent_chooser_default_dispose): Reset the state on dispose.

	(cleanup_after_load): load_id != 0 && load_state == LOAD_EMPTY
	is a valid state, if the main loop never had the chance to
	properly spin at least once. (#438671)

svn path=/trunk/; revision=17866

diff --git a/ChangeLog b/ChangeLog
index a4a2bc81ab0c4b07d8a4ccd957e438bc38784878..90bc1abb7381dee7c08da62635cf163bb9460032 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-18  Emmanuele Bassi  <ebassi@gnome.org>
+
+       * gtk/gtkrecentchooserdefault.c:
+       (gtk_recent_chooser_default_dispose): Reset the state on dispose.
+
+       (cleanup_after_load): load_id != 0 && load_state == LOAD_EMPTY
+       is a valid state, if the main loop never had the chance to
+       properly spin at least once. (#438671)
+
 2007-05-18  Emmanuele Bassi  <ebassi@gnome.org>
 
        * gtk/gtkrecentchooserdefault.c (recent_meta_data_func): Mark

diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index 3cd4d6a4d71f11637749766acd06c4b8a76b021d..cf7254b87d1a42034c85c19e19edf0eb8580ba8d 100644 (file)
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -590,6 +590,7 @@ gtk_recent_chooser_default_dispose (GObject *object)
   if (impl->load_id)
     {
       g_source_remove (impl->load_id);
+      impl->load_state = LOAD_EMPTY;
       impl->load_id = 0;
     }
 
@@ -839,7 +840,8 @@ cleanup_after_load (gpointer user_data)
 
   if (impl->load_id != 0)
     {
-      g_assert ((impl->load_state == LOAD_PRELOAD) ||
+      g_assert ((impl->load_state == LOAD_EMPTY) ||
+                (impl->load_state == LOAD_PRELOAD) ||
                (impl->load_state == LOAD_LOADING) ||
                (impl->load_state == LOAD_FINISHED));